Merge from trunk.
authorPaul Eggert <eggert@cs.ucla.edu>
Wed, 14 Dec 2011 10:50:02 +0000 (02:50 -0800)
committerPaul Eggert <eggert@cs.ucla.edu>
Wed, 14 Dec 2011 10:50:02 +0000 (02:50 -0800)

Trivial merge